APC & some fixes.