Repackage, fixes