Fixes for other compilers