fixes for a successful build