- a few more minor code quality fixes