Fixed a few things in clerk