Fix up a few errors created by #65