Fixes for old compilers