Merge "Fix some reflection errors"