Fixing bug fixes

These two tweaks fix up style issues introduced by recent commits.