More changes for CodeMash