Some minor codechanges.