Some fixes for markup