Fixed issues with 1.7 compiler.