Fixed a couple more minor errors in the new code.