Simulator minor fixes
Merge branch 'master' into examples/ada-tasks