MInor improvements