Fixes for comments isolation