Various updates for Blueprints 2.4.0
Various fixes for Blueprints 2.5.0