few quick fixes