Make package, fix static