Fixes on comments