Small changes in spelling and imports to remove potential errors