Two minor bugfixes before release