Fixes for problems parsing reStructuredText