Various ACP fixes