Various fixes to get build and tests working for Blueprints 2.5.0-SNAPSHOT