Fixes to make it compile