Style related fixes (2)