Some fixes for incomplete collections