Shared renderer fix, a few namespace improvements