Minor bug fixes. (2008-05-31)