Misc gyp cleanups