Fixes for older compiler