Fixes to latourandorder etc from gcatpix branch