Update some issues with encoding and future imports