Minor changes for compile on the farm