More markup error improvements (issue #8)