Fix some bad behavior. BAD.