pspush updates and fixes...

Change-Id: Icee1201e8b2bbd743da803493d557044e0a0fec0