Fixes to Ooze Prevention