More singleton hacks