Synch up with minor artifact map changes