classes: misc fixes