guideline fixes