fix for push tracking and hot fix snapshot checks