Minor fixes to static classes