pushing more compiler fixes