Fix runtime issues surrounding packaging