Fixed some packaging stuff