Bugfixes

Closes three small bugs. I'm not sure the RST fix is correct but it doesn't appear to cause any problems. 

Fixes #1732, #1719, #1652