Tweaks for offline necessity.