Reduce template depth needed
Add explicit overrides
Clang/Travis fix