Fixed map render issues