Fixing multi-file run errors for issues #11