Offline issues resolved