More fixes, fixes, fixes. (Sonar is addictive)