Bugfixes in Apc drivers