Fixes in singleton type recognizing #SCL-5661 Fixed