Fix broken maps