BeginDrawing and EndDrawing calls should be removed, not added.  Perhaps you didn't merge correctly with my recent and just copied your old files over my new ones?