MegaSkanks fixes