Minor fixes for r921.


git-svn-id: http://voronet.francu.com/repos/DEX@922 8d550267-2627-4c68-899f-85492a8dd5ca