Remove some compile optimisations to fix warnings on older gcc