Fixes for camp

Fixes, incorporating some of the pull request comments from https://github.com/brooklyncentral/brooklyn/pull/960.