Fix guideline bugs