Multiple style fixes