[PATCH] converted CCIs, fixed validation problems