some quick fixes