Fix offline errors