Fix up for packaging