Some fixes for rst