Fixes bugs added in from checkstyle