Some fixes in parsing Markdown format