More fixes for other compilers