Improved: Many bugs from
http://ci.dustplanet.de/job/ColorMe/46/findbugsResult/