some quick fixes based on qa