Fixes (checkstyle, and weirdo property issue)