Committing last uncommitted changes from old, Ubuntu-based EVM machine. These may need to be reverted.