Fixed oopses

I hope there aren't any more oopses to fix