rgw: more firefly backports