More fixes in the installation procedure, based on input from Keith Laaks (keithl@voxtelecom.co.za)