further C4 adapter fixes and improvements