Fix the inclusion of extras/contrib/bin to the PATH