OF-Config fixes for OF 1.2