Miscellaneous warning fixes

Can we add an @Override instead?