Wait explicitly for map/unmap to finish