Fix up for a public release!