Smaller bugfixes.