map updates - fixed reference issues