Add artifacts for drawing.
Fix build in Linux
Fix build in MacOSX