quick and dirty fixes