Fix minor style issues
Fix regression issue

Bug fixed in 82a4212918bed6f6610122992769cc1d5ed7101f was reintroduced during merge.