Fixing actions with vector graphics, cleanup