Fixes for changes in brooklyn 0.4.0-SNAPSHOT