Fixes for OC and other stuff