some quick and dirty fixes