quick and dirty fixes to make it compile