Added couple touches to fix timestamps