Interface changes and bugfixes.