Release/0.3.36

A pair of fixes and general changes for making a new release.