Fixes/gyp