Style bug fixes