Quick markup fixes