More word fixes