Fake models

A couple of small changes.