Last style fixes