Fixes for new compilers