Fixed the final two synchronous calls I could find