Added missing waits for future serialization