Try to fix the bin vs. sbin issue and env.sh sourcing