Edit and fix some items