More grinder/slaughterhouse fixes