Various CPool fixes and improvements