OC Integration & Bug fixes.