Fix timming issues