More Row Fixes