Improvements on offline handling and shutterOp