Minor changes to appease checkstyle