Modified the code to fix various pushPolicy issues