Opg core fixes

A few fixes to get the modules we need.