Some fixes and a workaround for an issue with chisel grass.