fixes with Ribs templates