Fixes to get successful build