Patching some creation and rendering logic.