fix some idioms