Minor bug fixes and push connection improvements