OF fixes