Fixes for some compilation issues from Eclipse refactoring, and some reformatting.