Apply some fixes from Carlos
Merge pull request #6 from morevnaproject/new_cairo_core_2

Apply some fixes from Carlos