fixed compile & test #16 issues with the blueprints changes