Bug fixes for push delta