Cleanup and a few additional checks in Push driver.