more OMR Bootstrap changes