class level fixups