Fixed some overrise warnings