Fixes on EditItem