More time fixes etc