More fixes to compiller