Partly fix issues on MSBA2