Fixes to compile on cluster