more compiler fixes