Some style bug fixes