Fixes for issues I found in that initial commit.