Add override where needed by clang++