rep, package fixes and such