Couple commits from @neilt6