some fixes in Blueprints model wrappers