BOP related fixes.