Implement timing fixes