fix some errors due to latest Brooklyn changes