Fix a couple of override syntax issues