BSP fixes for Mojo V2