fixing some oopses