Minor timing changes