3D driver script fixes
Work around decorator module not liking callable objects