Minor fixes before release

@peter-budo:

Two minor fixes, could you please test them? If all is well, I'll try to do the release tomorrow evening off my work laptop. :-)