Some fixes with markup