Cleaned up some build issues that arose when using JDK 7...