Small fixes and better quoting.