Some minor updates based off changes that have happened in master