bugfixes according to the interface change