Fixed issues with blueprints