Fixes to over SIM refactoring