Fix usage of override and virtual keywords
Merge pull request #426 from DataEverywhere/cleanups

Cleanups