More Style fixes