a few quick fixes