Added missing BINDER type in ArgumentResolver + small fixes