first round CR fixes