mxs: fix image build issues