some fixes (esp when no inet connection available)