Fixed some issues with source code using java 7 features.