Final changes before switching to 1.6 oe instance