Fix some style issues introduced by PR#4720