cr fixes #2