Fix item completion/editing breakage, other fixes