3.0 Fixes

Couple of fixes and changes