Fixed timing errors