Ribbon fixes

Ribbon fixes