Style fixes for issues