Bug fixes for comment load