Fixes to compile on singular