Fix "method redefined" warnings