A few quick fixes to make it compile