Extra changes to work with python3