More intendation fixes