Style fixes and other stuff