Fixes for comments.