More offline tweaks