Fixes to compiler