Fix two bugs in markup