Final fixes to the error from the last commit.