Fixes to various classes