Fix commits from review