Minor fixes
Revert get time to pre-numble code