Fixes for older compilers