small changes from Campbell Barton
no need for extra UV checks, as suggested by Campbell Barton