Wait until present fixes