Even more fixes for other compilers