Fix for some missing markup