Cleaned up a few issues resulting from the merge of the 1.0 branch with this (master) branch.