Fix some packaging stuff