2.1 oo install fixes

A few fixes to address recent issues.