Fixed bug in upgrade visibility check, additional comments