Pull request fix-ups