Bug fix

Adds my fixes back.