Style related fixes