Fix some style issues wrt #9081