Make configuration checking more efficient & fix license