Fixes to get code copiling