zoom issue fixes