Fixes for timestamp