Fixed compiler issues with new version of compiler