[DEV] Fixes for python3