acceptance bugfixes