Bug fixes + APC Client