Small override fixes