Fixes for BS3.0 - Master file