Changes to conform to latest commit on master