Fix guideline bugs again