Simulacro: Bug fixes

Several issues found during testing have been fixed.