Updated auto complete to work on RHEL5