Fix BOP requirement and potential paintbrush crash