Minor timing tweeks