Timestamps/locks fixed