small fixes on graceful degradation