Fix a lot of stuff regarding offline