Fix up library