A few more offline tweaks