Various small fixes
Update cleanup script