Fixes for Blueprint container