Misc changes to make eclipse happy