Fixes on the singleton procedures