Fixed up some funny things in composite.py