Minor bug fixes. Revision bump.