offline fixes