[BUGFIX] Fix comments in various places