ROW and CFQ Tweaks