Basic markup fixes