Fixed bugs in field collection implementation.