template overrides: More fixes