Fixes for comments