Fixes for the OCD driven self ;-)