Updating some more changes from master