Fixes to ApC