auto timing fixes