Fix #737 by adding the override specifier where needed