Fixes for error messages on comments