Some fixes to get the code compile