Updates to fix image problems