various commits to get z20connects working again.