fixes to make compile