Fix some oopses