Fixed issues recently introduced in primitive collections tables