More fixes for the User Markup code.