Fixing more non-windows compilation problems