Import fixes, remove use of unicode