More markup fixes