Fix text imports
Minor simplifications