Use fork of omnibus-software to avoid errors