Changes to fix image sharing