Some markup cleanups post FPWD