[crux-contrib] Some more ports for contrib(?)