fixing to use only needed software and use more of the upstream ones