minor changes so compiles on more than just java 1.7