Fixes per pmartel feedback.