Minor changes suggested by @xabbuh