Update changes, fix python 3 issue