Can now fetch names again. Minor fixes.