Small bugfixes.
Small improvements.