Fixes and changes
Fix, fix, fix
BOP versions