Fix a few bugs in take creation