A few small markup tweaks and fixes