Fix for APC and simplify install.