Fixed update issues