Fixed some spots where I forgot to reference the map properly.