Prepare for oef work + few fixes