More override fixes - thanks, clang!