online-offline fixes