Implemented offline fixes