Fixing compatibility issues for Grape master