Code fixes to reflect changes made in previous commit.