More OSE workflow tweaks