Add @Override where needed, fix possible NPE.