Minor fixes for issues introduced in most recent commit.