Fix bugs with marker updates