bugfixes from the framework import