Split into seperate interfaces for master & slave
Misc changes to fix issues found during syn_acortex_base_test