Fixing Dave's errors. Typical.