Updating to align with python version

Also add some other fixes