Fix comments from Garrett