Quick and dirty fixes