Various offline-working fixes