Fixes to module track switching