Two minor bugfixes