Pick up commits from master plus little fixes from me