timestamp related fixes
more entity cleanup
Merge pull request #2836 from kurund/entity-fixes

Entity fixes