Peewee fixes