additional guideline fixes