Minor tweaks for RWK integration