further fixes to installation routine