Set of changes suggested by vleck