Fixes for ribbon