Some minor updates for version 6.04.