#3: Small bugfixes.