Fix some style-related bugs