Fix compiler-specific compilation problems