Updates for OSE 1.2 and bootstrapper