Cleanup of 8a60b78: Fixes for running code compiled by ESC
Merge pull request #365 from artcompiler/esc

Cleanup of 8a60b78: Fixes for running code compiled by ESC