AvdP - Fixed singletons again

Some stuff didn't get merged / pushed properly.