More minor changes for Slick2d