Some OSE related fixes.