Minor fixes for running on corn machines