Object::pushMap and RSP fixes