Various item delete and update fixes