Fixed some things pointed out by Jenkins.