Miscellaneous warning fixes

So we should annotate it with `@Override` then I guess