Some fixes for rdiscout -> redcarpet