Merge more ponypack updates