More bugfixes with timing