Minor - format code.
Fixing redirection see BT#8207
Fixing redirection see BT#8207 and #6768