Prairie fixes

This PR is the same as #217, but for the dev_4_4 branch.