Fixed issues for create collection