Update BOP support for 1.6.2 (at least fix breaks due to config file
churn)