Added fixes for comments