Fixed a bug in guess compname
Small changes