more adaptation to minimal installation