Fixed comments from code review on 3.8.2013